Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: change name of community Flux module #1

Merged
merged 3 commits into from
Jun 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
225 changes: 0 additions & 225 deletions .circleci/config.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .devcontainer/Dockerfile

This file was deleted.

27 changes: 0 additions & 27 deletions .devcontainer/devcontainer.json

This file was deleted.

8 changes: 0 additions & 8 deletions CODEOWNERS

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile_build
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
FROM rust:1.68 as RUSTBUILD

FROM golang:1.19 as PKGCONFIG
COPY go.mod go.sum /go/src/github.com/influxdata/flux/
RUN cd /go/src/github.com/influxdata/flux && \
COPY go.mod go.sum /go/src/github.com/InfluxCommunity/flux/
RUN cd /go/src/github.com/InfluxCommunity/flux && \
go build -o /usr/local/bin/cgo-pkgbuild github.com/influxdata/pkg-config

FROM golang:1.19
Expand Down
19 changes: 0 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -160,21 +160,6 @@ libflux/flux-core/src/scanner/scanner_generated.rs: libflux/flux-core/src/scanne
libflux-go: $(LIBFLUX_GENERATED_TARGETS)
$(GO_GENERATE) ./libflux/go/libflux

libflux-wasm:
cd libflux/flux && CC=clang AR=llvm-ar wasm-pack build --scope influxdata --dev

clean-wasm:
rm -rf libflux/flux/pkg

build-wasm:
cd libflux/flux && CC=clang AR=llvm-ar wasm-pack build -t nodejs --scope influxdata

publish-wasm: clean-wasm build-wasm
cd libflux/flux/pkg && npm publish --access public

test-wasm: clean-wasm build-wasm
cd libflux/flux && CC=clang AR==llvm-ar wasm-pack test --node

test-valgrind: libflux
cd libflux/c && $(MAKE) test-valgrind

Expand Down Expand Up @@ -204,25 +189,21 @@ checkdocs: $(STDLIB_SOURCES) libflux/target/release/fluxdoc bin/flux
# This list is sorted for easy inspection
.PHONY: bench \
build \
build-wasm \
checkdocs \
checkfmt \
checkgenerate \
checkrelease \
checkreproducibility \
checktidy \
clean \
clean-wasm \
cleangenerate \
default \
fluxdocs \
fmt \
generate \
libflux \
libflux-go \
libflux-wasm \
lint-rust \
publish-wasm \
release \
staticcheck \
test \
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Flux - Influx data language

[![CircleCI](https://circleci.com/gh/influxdata/flux/tree/master.svg?style=svg)](https://circleci.com/gh/influxdata/flux/tree/master)

# Flux - Community fork of Influx data language

Flux is a lightweight scripting language for querying databases (like [InfluxDB](https://github.com/influxdata/influxdb)) and working with data.
It is part of InfluxDB 1.7 and 2.0, but can be run independently of those.
This repository contains the language definition and an implementation of the language core.

**Note:** This is the community fork of Flux. The Flux version that is maintained by InfluxData lives [here](https://github.com/influxdata/flux).
If you are seeking to make changes to Flux for use in your own projects, this repo is the right place to be.

## Specification

A complete specification can be found in [SPEC.md](./docs/SPEC.md).
Expand Down
5 changes: 0 additions & 5 deletions TODO.txt

This file was deleted.

6 changes: 3 additions & 3 deletions array/array.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"strconv"
"sync/atomic"

"github.com/InfluxCommunity/flux/codes"
"github.com/InfluxCommunity/flux/internal/errors"
"github.com/InfluxCommunity/flux/memory"
"github.com/apache/arrow/go/v7/arrow"
"github.com/apache/arrow/go/v7/arrow/array"
arrowmem "github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux/codes"
"github.com/influxdata/flux/internal/errors"
"github.com/influxdata/flux/memory"
)

//go:generate -command tmpl ../gotool.sh github.com/benbjohnson/tmpl
Expand Down
4 changes: 2 additions & 2 deletions array/array_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package array_test
import (
"testing"

"github.com/InfluxCommunity/flux/array"
fluxmemory "github.com/InfluxCommunity/flux/memory"
apachearray "github.com/apache/arrow/go/v7/arrow/array"
"github.com/apache/arrow/go/v7/arrow/memory"
"github.com/google/go-cmp/cmp"
"github.com/influxdata/flux/array"
fluxmemory "github.com/influxdata/flux/memory"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions array/binary.gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package array
import (
"math"

"github.com/InfluxCommunity/flux/codes"
"github.com/InfluxCommunity/flux/internal/errors"
"github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux/codes"
"github.com/influxdata/flux/internal/errors"
)

//
Expand Down
Loading